From 2988e3b9d23d67053eff5309e14b8d0ae1ba8591 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 15 Nov 2010 09:31:38 +0000 Subject: [PATCH] x2apic: Remove a panic condition in enabling x2APIC Currently Xen triggers a panic if user disables VT-d by command line while not disable x2APIC. This requires users to specify both "iommu=0" and "x2apic=0" to disable VT-d if the platform supports x2APIC. It's not user friendly. This patch removes the panic condition. That's to say, don't require user to specify "x2apic=0" when specify "iommu=0". As long as VT-d is not enabled (disabled in BIOS or in command line), x2APIC won't be enabled naturally (x2APIC depends on VT-d Interrupt remapping). Signed-off-by: Weidong Han --- xen/arch/x86/apic.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 7c1913a18e..8329da1930 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1009,22 +1009,11 @@ static void enable_bsp_x2apic(void) } else { - if ( !iommu_enabled || !iommu_intremap || !iommu_qinval ) - panic("Cannot enable x2APIC due to iommu or interrupt " - "remapping or queued invalidation is disabled " - "by command line!\n"); - else - { - if ( x2apic_preenabled ) - panic("x2APIC: already enabled by BIOS, but " - "iommu_supports_eim fails\n"); - else - { - printk("Not enable x2APIC due to " - "iommu_supports_eim fails!\n"); - return; - } - } + if ( x2apic_preenabled ) + panic("x2APIC: already enabled by BIOS, but " + "iommu_supports_eim failed!\n"); + printk("Not enabling x2APIC: depends oniommu_supports_eim\n"); + return; } } -- 2.30.2